Rename the SCSS files for our themes
authorEmmanuele Bassi <ebassi@gnome.org>
Wed, 12 Feb 2020 20:18:27 +0000 (20:18 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 12 Feb 2020 20:22:43 +0000 (20:22 +0000)
commit2ab9be54fb34c61eedbbb89b78ce9db23ba81e8a
tree67be4d07c490feaded55aced72e9e5ad8f3a3d7b
parent4247bf0fb64f5d9e65ac83f7cc48555c43e07cfd
Rename the SCSS files for our themes

It seems that Meson's gnome.compile_resources() cannot deal with two
files with the same name under different directories, which breaks the
build parallelism because the GResource file ends up not depending on
either the Adwaita or the HighContrast gtk-contained.css file.

This commit only changes the on-disk names of the Adwaita and
HighContrast SCSS files, and the corresponding generated CSS files; the
files in the GResource are going to be aliased to the old file names, to
minimise the breakage. We might want to change the theme entry points at
some later date, if we decide to commit to this naming scheme.

Fixes: #2423
See Meson bug: https://github.com/mesonbuild/meson/issues/6615
12 files changed:
gtk/gen-gtk-gresources-xml.py
gtk/meson.build
gtk/theme/Adwaita/Adwaita-dark.scss [new file with mode: 0644]
gtk/theme/Adwaita/Adwaita.scss [new file with mode: 0644]
gtk/theme/Adwaita/gtk-contained-dark.scss [deleted file]
gtk/theme/Adwaita/gtk-contained.scss [deleted file]
gtk/theme/Adwaita/meson.build
gtk/theme/HighContrast/HighContrast-inverse.scss [new file with mode: 0644]
gtk/theme/HighContrast/HighContrast.scss [new file with mode: 0644]
gtk/theme/HighContrast/gtk-contained-inverse.scss [deleted file]
gtk/theme/HighContrast/gtk-contained.scss [deleted file]
gtk/theme/HighContrast/meson.build